From 83b7a0f0e5fd1eb49dc7e7ce8811b69434897aad Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 25 Jul 2015 17:22:41 -0700 Subject: [PATCH] wayland: Fix initial fullscreen monitor support -1 means that we have no specific preference for an initial fullscreen monitor, and -1 is less than the number of monitors, so we would end up accessing invalid memory. Prevent that. https://bugzilla.gnome.org/show_bug.cgi?id=752875 --- gdk/wayland/gdkwindow-wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index e9d077e00e..deda194341 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1001,7 +1001,8 @@ gdk_wayland_window_create_xdg_surface (GdkWindow *window) const gchar *app_id; GdkScreen *screen = gdk_window_get_screen (window); struct wl_output *fullscreen_output = NULL; - if (impl->initial_fullscreen_monitor < gdk_screen_get_n_monitors (screen)) + if (impl->initial_fullscreen_monitor >= 0 && + impl->initial_fullscreen_monitor < gdk_screen_get_n_monitors (screen)) fullscreen_output = _gdk_wayland_screen_get_wl_output (screen, impl->initial_fullscreen_monitor); impl->xdg_surface = xdg_shell_get_xdg_surface (display_wayland->xdg_shell, impl->surface); -- 2.30.2